Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 26 Apr 2011 17:50:51 +0000 (10:50 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 26 Apr 2011 17:50:51 +0000 (10:50 -0700)
commitd7d8e5f54d4bd1d8ad894ffb8a4ce60f73731c58
treeeb92a56b2c893bab5ebd6929d98f74363df951c6
parent188293d8d8a905ea292affab7b28c82cf44ccbb4
parent1cafa371d8153286a8f0677166a1d69d98c3f05b
Merge from mainline.
src/ChangeLog
src/gnutls.c
src/keyboard.c
src/lisp.h